Merge "Store work lock type even it uses unified lock" into nyc-dev