MULE-7731 Make changes from PR feedback