Merge tag '2.2.2' into develop

Version 2.2.2
Fix incorrect order detection.
Merge branch 'release/2.2.3'