MULE-7655 Changes based on PR feedback. Take 2