Merge remote-tracking branch 'remotes/origin/main' into 473-integrate-non-diegetic-panning-into-the-new-jbm-path