OC-6048
updating code to include changes to instance
Merge remote-tracking branch 'origin/OC-6048' into OC-6048

merging code locally.