Merge remote-tracking branch 'upstream/edge' into feature/cnc-pendant-panel