Merge remote-tracking branch 'origin/744_step1_scripts_and_brir_fix' into 744_step1_scripts_and_brir_fix
