A resource is now also picked up when a lookup is referring to it
Merge conflict
Tagged as stable