Async is an option 1.6.x

corresponds to issue #1511 and also includes a missing nit-pick commit to make the merge clean