Merge branch 'main' into 2086-fix-enable-hp20_fx_32_opt-for-encoder