Resolve "gss code cleanup"

Merged Razvan Becheriu requested to merge 2173-gss-code-cleanup into master
Edited by Razvan Becheriu

Merge request reports