Merge branch '2.2-dev' into issue122

merging 2.2-dev into issue122
1 job for issue122 in 1 minute and 25 seconds