Merge branch 'main' into 1843_fix_io_qfactor_init