Merge pull request #923 from mulesoft/MULE-7808

Mule 7808
(cherry picked from commit 4775d44764dfbfbc5de65f31662b4fb65247aa8b)