Changes based on foundation test and release