Merge "BUG-1436: deprecate IntermediateMapping"