Merge branch 'ma/roll-back-lockfiles'