Merge branch 'mh/verify-lock-error-report'