Merger of git branch "gimple-classes-v2-option-3"