TRUNK-3846(cherry picked from commit cda25d93e01904bd7d3f2e2bd93ed6c508bb3609)