Follow up to  - TRUNK-4123, TRUNK-4124, TRUNK-4125