Foundation 5.2.2 adjustments