Merged upstream v0.9.5