Main development, master branch after release/0.10 branched off