Bug 11559: Supporting changes for Rancor