[fix] Use `options` passed to constructor, not `before`
Merge branch 'master' into v0.8