update to 6-9-stable