Follow up to address review comments - TRUNK-4151