Main development, master branch after release/4.2 branched off