Pulling from upstream v2_4_x

Pulling upstream changes for v2_4_x