Merge Modules changes.