Fix argument parsing in !Option
Version bump
Merge branch 'hotfix-3.5.1' into dev