fixes #517
Merge branch 'staging' into prod