Merge remote-tracking branch 'gh/next' into gp20-alpha-drop-stable