MULE-7731 Make change from PR feedback