Merge branch '1.0.5.X'