[[ Bug 13738 ]] AV references not being resolved correctly