Auto-commit from Yao
Auto-commit from Yao