Override onDestroy
Merge branch 'develop'