Update from review CR-MAGEDOC-111