update to 1.2.2
Merge branch 'ST2'