Merge branch 'develop'
Update args list for new version of opt-merger