MULE-8028 - Adding PR changes