Added parameterized locks
Merge branch 'master' into paramLocks