[Fixes #  52124275]
Merge remote-tracking branch 'origin/master'