Merge commit '3667b9b471a6585d22106cbfe4a04111ca86643c' into kraken * commit '3667b9b471a6585d22106cbfe4a04111ca86643c': revert the stripping of System Group:
Merge commit '3667b9b471a6585d22106cbfe4a04111ca86643c' into kraken * commit '3667b9b471a6585d22106cbfe4a04111ca86643c': revert the stripping of System Group: