Merge branch '0.5.0.x' into 0.5.x