attempt to relieve bot stress
Merge branch 'gh-704' into staging