Merge tag '2.2.2' into develop

Release version 2.2.2
Only set default value when required.
Version bump
Merge branch 'release/2.2.2.1'