Changes to support 27045