MULE-7091: Improvements per code review