Before TRUNK-3780 merge