Merge "Added a GTS test flag for BICS." into main