Merge remote-tracking branch 'origin/main' into 1878_basop_port_mr_1770_mcmasa_indexing_bug