TRUNK-3915 Resolved and successfully tested.
(cherry picked from commit cebb56d9a123a47ff420c0ade74239d2c3d8c426)