Merge branch 'release/0.22.4' into develop
Fix issue where sys.argv was being passed to parse_args instead of just None
Bump version to 0.22.5
Merge branch 'release/0.22.5'