Merge remote-tracking branch 'mmc-uh/next' into base