Fix ICS compat issues
Merge branch 'fix-icscompat' into update-addfolder