Fix of incomplete migration done in PR #5896
Merge pull request #6200 from Martin-Grunewald/FixOfIncomplete5896Migration

Fix of incomplete migration done in PR #5896