Merge branch 'main' into 463-td-renderer-directivity-unintentionally-reset