Merge pull request #8697 from sivarv/lockAddFix