MULE-7535 Best to be conservative and not attempt to make things consistent for now.
Merge pull request #628 from mulesoft/MULE-7535

MULE-7535 Best to be conservative and not attempt to make things consist...