Merge remote-tracking branch 'origin/main' into 710-omasa-jbm-rendering-has-wrong-metadata-update-sync-in-td-rendering