Fixing issue with clearing version history
Merge branch 'develop'