code cleanup
Merge branch 'master' into incremental-updates