Merging oa-casport1.0 changes into master

Merging oa-casport1.0 changes into master