Merge branch 'mh/maint-lockfile-overflow' into maint