develop to match 1.2.0