7 Commits (HuaHua404-patch-3)