Merge remote-tracking branch 'devel/issue574_mpl_needed_by_some_Tests'