initial work on TRUNK-4144