This should be done on the master branch immediately after the NAV 5.10 series has been branched off, but no sooner.