[sync master] 1.5.5.5

Fix #486