Merge "LockAgent: Refactor transformation code"