Fixes for TRUNK-4170