Main development, master branch after release/1.0 branched off