Group class methods under class << self
#981
+386
−364
Merged
class << self
#981