Merge branch 'dm-4.16' into block-4.16_dm-4.16