[Emptied]
Merge branch 'master' into emptied
[Undo Emptied] Reverted accidental merge
[Tests] Added async test
Minor rename