Merge tag '2.2.2' into develop

Release version 2.2.2