Merge "Support dynamic input mapping"