Fix options for API dump
Merge branch 'beta' into staging