Cherry-pick "Merge branch 'FolderFixes-1.0-20180313' into '1.0'" into master
IDE Folder Fixes, 1.0 branch (2018.03.13.)
See merge request !254 (merged)
(cherry picked from commit 6721ee3d)
IDE Folder Fixes, 1.0 branch (2018.03.13.)
See merge request !254 (merged)
(cherry picked from commit 6721ee3d)