4.3; bug foxes for GSA tools

even if there will not be another 4.3 released I thought it would have been useful to cherry pick these commits.