Refactor
Merge branch 'master' into kc-refactor
Merge pull request #4845 from guardian/kc-refactor

Refactor DFP API Wrapper