Merge branch 'main' into 1283-remove-basop_util_add_mant32exp-from-accontextmapping_enc_fx-c