Updates from Sony codedump 11.2.A.0.31