Merge branch 'main' into 876-nonbe_unified_decoding_paths-increased-memory-consumption_ver2