Fix no data options
Merge branch 'release/2.0.0'