Initial commit. After LockType-object-changes