Changes to support 19359.