Trunk-3972 clean pull request