Merge pull request #1513 from dxichen/merge-state-backend-async-commit

Merge changes from master onto feature branch.