First merge (v1.2.1)

To merge the changes made up to v1.2.1