Merge of branch NPC to Master