[Based on features/async-return with tests ported from that branch.]