MULE-7053. Code review change