[development] Trouble with upgrade paths from different branches