Issue #2697 first version of new rw lock was created and added into schema.