#12821 adjustments