Changes for #89427: Porting modification for material budget issues to the Release...