#SGA-1 bug fixed
+review CR @manuel.ruelke @tobias.zander @david.manners @michael.ryvlin