revert to f0fc4e14f
Add getProgress() method
cherry picking wills commits