Remove alternate timing method thingy
Merge remote-tracking branch 'origin/develop' into feature/remove_alternate_timing_method
Merge remote-tracking branch 'origin/feature/remove_alternate_timing_method' into develop