[Added] Npcs at lesser poi & misc stuff

Change-Id: I99b1074fa09470448a56c1d144b9bf60917ab7dc
Merge "[Added] Npcs at lesser poi & misc stuff" into unstable