Synchronized "attribute-resolver.xml" with the biancini version