Cherry-pick "Merge branch 'PlatformUpdates-1.0-20180228' into '1.0'" into master
Platform Updates, 1.0 branch (2018.02.28.)
See merge request !245 (merged)
(cherry picked from commit 7a2d1279)
Platform Updates, 1.0 branch (2018.02.28.)
See merge request !245 (merged)
(cherry picked from commit 7a2d1279)