merge war 1.2.0 changes