Main development, master branch after release/8.0 branched off