Merge proposals dependent on lp://qastaging/~ericsnowcurrently/landscape-charm/fix-1610413-collect-inner-model

1. fix-1610413-collect-inner-model
2. Dependent merge proposals