Main development, master branch after release/1.1 branched off