isFolded/isUnfolded states
Merge branch 'master' (0331) into folding