Merge pull request #4680 from MartijnKaijser/13.1_b1