MULE-7268: Make suggested fixes