Merge branch 'js/diff-notice-has-drive-prefix' into maint