Merge "Layout string data" into oc-dev