MC16s: change input_build to not be is_many
Merge remote-tracking branch: upstream/master