Main development, master branch after release/1.2 branched off