Merge branch 'release/0.6.16'
Merge branch 'release/0.6.17'
Merge branch 'release/0.6.18'
Fix slow saving by not clearing cache every time.
Merge branch 'fixSlowSaving' into develop