Merge branch 'main' into 488-waveform-and-md-desynchronized-in-external-renderer