static serving fix
static fix
Merge branch 'develop' into staging