Merge "Consolidate waiters methods"