Merge "Add shadow and wrapper classes" into oc-dr1-dev