Grab changes in 1.12 branch