MULE-8011 - adding PR feedback