Merge branch 'issue740' into 1.6.x
Improve error message when invalid option format is provided
Merge branch 'issue739' into 2.0.x