Merge "Include owner in createLockRef"