Branch off the 2.2 compiler
Merge pull request #2758 from systay/compiler-v2_2

Branch off the 2.2 compiler