Merge branch 'mm/apply-double-slash'