18 Commits (HuaHua404-patch-2)