Trunk-4444 Implementing feedback on earlier commit