Before merging with 2.1
Fixes for storage and Activity states
trash removed