Hi Pierre - Thanks a lot for the fast response 
Waiting for a fix is the best option for us - as we need to do exactly the same on our production instance. Our upgrade process includes 100% automation via Ansible - so fiddling with SQL by-hand is a no-go.
Let me know if you confirm this as a bug which will be fixed. Thanks in advance.