Merge branch 'enhancement/provide_more_options'


Former-commit-id: d5052e15
Former-commit-id: ee50d353
2 jobs for v0.10.4
latest