fix critcl argument order
Merge branch '2.1' into 2.2
Merge branch '2.2'