Merge branch 'master' r216746-r217593 into gimple-classes-v2-option-3