Update from Foundation 1.2.8 to 1.3.1