Release 1.2.0 - DO NOT MERGE