Merge branch 'sg/lock-file-commit-error'