Merge remote-tracking branch 'remotes/origin/main' into 649-renderer-application-dependency-on-prot-h