Migrate from GA to CPA
Merge pull request #435 from sobtiankit/master

Add CPA without breaking the existing GA implementation for Legacy app