(cherry picked from commit cc3981b1272b9ce37e7d734a7b2f42e84acac535) (cherry picked from commit 915c2f67)