Add new Scout category to fix the only BIG problem
Define for Harbinger, just in case
Merge branch 'icedreamer/Improve-GSR' into develop