fixes for TRUNK-4011