v.21.3Bug Fix

Fix for issue #19314 and PR #20156 by Ivan

Official CH changelog text
Fixes #19314. #20156 (Ivan).
PreviousNext