Merge branch 'main' into 744_step1_scripts_and_brir_fix