Merge branch 'mp-532'