TRUNK-3773
Cleaning up TRUNK-3773