Merge for 0.9.0-rc.1
merged back

(for easier updates in the future)