Merge branch 'mp/diff-algo-config'