Update for 1.2.1.2122 changes