Update for latest code changes.
Merge branch 'master-aic' into aic-citi-db-connector