[US159.1] Initial commit for 2.3