GIA-2925 Fixes scheme
Merge pull request #244 from guardian/gia-2925

GIA-2925 Fixes scheme