Changed the link pointing from entity map.
Merge remote-tracking branch 'origin/master'