Merge remote-tracking branch 'origin/main' into hw/update_issue_69_DISABLE_ADAP_RES_COD_TMP