Implement feedback on TRUNK-4509