FIX batch save error.
Merge branch 'develop'