#19758 Fixes from code review