Merge "Add Timing interface"