Merge branch 'release/v0.9.4' into develop
add extended-meta option
version bump
Merge branch 'release/v0.9.5'