This is the Bugfix of #4512
Merge remote-tracking branch 'origin/master'