Merge tag 'v0.9.7'

v0.9.7
Merge tag 'v0.9.8'

v0.9.8
Merge tag 'v0.9.10'

v0.9.10
forward version id
Revert "forward version id"

This reverts commit a93b66c863096faabf9dabcdcd35a60d9cb6cd04.
Merge remote-tracking branch 'upstream/master' into develop