Foundation 5.2.3 adjustments