#12680 Add final fixes