Merge "Module Sync Lock State implementation"