Final master 1.2.0