CORE-421 modify custom attributes

CORE-421 modify custom attributes