Main development, master branch after release/2.6 branched off