Update 0.5.5 branch