Lock guard at 2.7.3
Merge branch 'master' into develop