Merge "Preserve attributes needed for CTS" into oc-dr1-dev