Fixing Progress Estimation Bugs
Fixing Progress Detail bugs
Merge origin/develop into develop