Merge "Fix test run for GSI" into main