BRANCH 4.2-DEV: set visible folder option back: needs performance
improvement