sf234prepare branch 1.2.X