Rolling back the tweaks
Merge branch 'develop'