Merge remote-tracking branch 'remotes/origin/main' into 864-jbm-jbm-control-gets-the-wrong-information-in-case-of-non-20ms-rendering-frames