Merge pull request #823 from mulesoft/MULE-7728

MULE-7728: Several improvements:
(cherry picked from commit 8f1b4b37add6be635613ae7cdb319aaaac88da6e)