[Mpi-22] Ticket #77 review