#FEC-1049 #comment  Moved NSString category to new class