add latch await
Merge pull request #1250 from ahmetmircik/issue1208_maintenance

Issue #1208