I’m sorry, @Averest, but I really have to claim it’s better to wait for the next release which will solve it for both Kingdoms. 
Edit: we know the issue AND the solution!
Now, it’s all just a matter of implementing in all files and work out some minor details 