4.3: cherry picked fixes to mode_compute = 5 and gsa