update for master merging
fix index for master
Merge branch 'develop' into staging