Merge remote-tracking branch 'origin/16-new-names' into next