1st merge of apis with master

1st merge of apis with master