Merge branch 'master' into mpr_rework