Added support for async relationships

Finding and setting up async relationships were failing as the code
expected all relationships to have been resolved.
merge fix
Merge branch 'KnownSubset-master'