MULE-7631: Considering extra cases per code review