Changes to support 26822