Merge remote-tracking branch 'Boris-de/wdrmaus_fix#8562'