MULE-7736 Feedback from PR review