Merge branch 'dm-4.12' into dm-4.12-post-merge