Merge branch 'MPMD-247'