[ui:cwd,tree] correction for iOS touch devices
Merge branch '2.1' into 2.1_n