#11837 adjustments