Merge remote-tracking branch 'upstream/edge' into add/universal-panel-adapter