Fix "Unsupported startup parameter: options" bug
Merge branch 'release/staging' into develop