Changes to support 26685