Rollback for async. Small timing issue caused a bug.

Need to investigate more before setting live.
Merge master to staging for version team city build 1.0.78