Basline for update to 3.1.5