[fixes #51021149] All is BROKEN
Merge remote-tracking branch 'origin/master'