Fix argument parser
Merge branch 'release-2.0-nightly' into release-2.0