fix trash path
refactor code for id/path change
core-4960 fix select all
Merge branch 'master' into STABLE