Merge branch 'main' into dlb_sba_encoder_complexity_opt