XD-2352 : Property replacement does not happen in XML class attribute

Temporary workaround