avoid direct use of AttributeReference
merge from the master