MP1-4333 : Rework handling based on code review comment.