Applied patch from Jinhu to address [94c6a431fee]