Merge "Added Time agnostic Onset and Abated classes"