Merge "Rename var XCI_LOOP to CI_LOOP to align with Functest"