I just double checked internal chat logs and noticed that we had this issue with exactly one instance. I could not find a solution other than manually commenting out stuff which I would like to not suggest.
So if this still occurs even if you go directly from 6.0 to 6.3.1 (which should be fine), let me know, I’ll bug developers again I guess.