DO NOT REPLY [Bug 23960] - add catalog resolver to