Prepare for release 1.2.0 Merging develop