If guid is empty, use the outer grap node's guide in warning entry
Update regressed test case
Add checking
Merge pull request #2752 from ke-yu/fix_regressions

Fix regressions