Update to support module_locks update