TRUNK-3944: Responded to review comments