Do not generate blank cells, commit in chunks
Merge branch 'develop' of https://github.com/UnifiedViews/Plugins into develop