Cherry-pick of "Merge branch 'IDEImprovements-1.0-20171109' into '1.0'" into master
IDE Integration Improvements, 1.0 branch (2017.11.09.)
See merge request !170 (merged)
IDE Integration Improvements, 1.0 branch (2017.11.09.)
See merge request !170 (merged)