Merge from v0.5.0