TRUNK-3751 new commit