Merge branch 'smart_waits_bb' into test_combo