fix: wait time should be best's, not optimal's
Merge branch 'master' into gh-pages