Project: mule
Issue MULE-8325: Review and merge MULE-7588
Review and merge MULE-7588
Story points: 5