Merge remote-tracking branch 'remotes/origin/main' into 744_step2_tables_and_bin_update_nonBE