Merge "Removed overlay from target" into oc-dr1-dev