v.23.10Bug Fix

Merging #52352 and #55621 by Alexey Milovidov

Official CH changelog text
Merging #52352 #55621 (Alexey Milovidov).
PreviousNext