Merge pull request #61 from 30x/APIRT-4751-newapidCore

Apirt 4751 newapid core