[4.xx-5.xx] Backport(backpork) for v1.001.004.7z