#19692 Final tweaks