Merge branch 'enhancement/provide_more_options'


Former-commit-id: e0311927
Former-commit-id: 0a8f3730
2 jobs for v0.10.5
latest