Fixes #2743710;
Ticket 2726521 (Make update more save)
Ticket 2726521
Make update from 3.0 to 3.1 more save.Ticket 2726521
Fix ticket 2723102
Change to old if construction.
Another test
Test
Bugfix in Syntax