Many API and CRP Changes
Merge pull request #954 from balabhv/vb548

Many API and CRP Changes