MULE-7291 - adding code review feedback