Merge branch 'release/0.90.1'