Merge shs_categoryhelpers to Github