Changes to support 27039
Changes for 27030.
Changes to support 27047.
Changes to support 27048