Fix/release 1.2 hotfixes