2388

Functional tests are passing, although I see Taylor did not convert all of them to async