Merge pull request #520 from eric-wu/develop

Merge down from release-1: Adjust throughputs according to the most recent monitoring