Merge branch 'enhancement/provide_more_options'


Former-commit-id: 54cb3838
Former-commit-id: 697e52b0
2 jobs for v0.10.1
latest