merge with 3.9a