Merge branch 'mm/lockfile-error-message' into maint