V1.1.0hd bug 896938

This patch is only for v1.1.0hd.