Github-Pull: #8439 Rebased-From: 7fdbce9de43c600776e00a2f2042d302cfa4e411
Signed-off-by: fanquake <fanquake@gmail.com>
Work in progress...