Merge pull request #2698 from realjiangms/shadow_stand_alone