Update to conform to 2.3 SW stack