Work around to use of string.joinv that core dumps intermittently.
Merge branch 'cablelabs/master' into cbl_dgalliga/async-data-source