.23 hotfix
Merge remote-tracking branch 'MaHuJa/hotfix23'