Change 237: System upgrade