Merge "Add KeyValuePairs support for modules."