Fixing rewrites
Merge branch 'develop'