Remove writting of zero strips from StripSet
Suppress writting of zero charge strips
Merge branch 'master' into production