Remove unused ivar
Make sure to remove all obavations
Merge branch 'refs/heads/fixFileUpdateNotification' into private_develop
Merge branch 'refs/heads/private_develop'