Merge "[Hoststubgen] Allow substitution methods to have..." into main