TRUNK-2553
(cherry picked from commit 7c519cc09b654d539514662e59c5e5c5f2c27643)