merge fromJasonGuanGitHub