(RE-586) Import 1.9.3-p484