trying to sort out static paths
Merge branch 'develop' into staging
trying to sort out static paths