[MF,RR]{refactoring} I22 - Bug fix
Merge branch 'master' of https://github.com/RolandDanninger/sw14_xp_04
[MF,RR]{refactoring} I22 - Bug fix