Foundation 5.3.0 adjustments