Merge pull request #383 from rattoma/4.3

4.3: cherry picked fixes to mode_compute = 5 and gsa