Merge branch 'nd/lockfile-absolute'