Save Expand state - Fix #669
Merge remote-tracking branch 'origin/develop' into develop