(cherry picked from commit 90ac0be86b898aefec5471db4027554c8e1b310c) (cherry picked from commit 5e10a13bb4759984494c6a870c7f08fb6693c9c0)