Trying to get static paths to work
Merge branch 'develop' into staging
Merge branch 'staging'