MULE-8100: Code refactor.