Merge pull request #9351 from annando/fixing-lock