Backport commit r4640 - - add game developer codes;