Merge "Renamed attribute with abbreviated name" into oc-dr1-dev