Artificial merge

Merged from MappingGen. Please do not delete the MappingGen branch.