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