Tweak periodic save to reduce runtime
Merge branch 'master' into dev