Auto-save updates and batch fetching of children
Merge branch 'dev'
4.33.1