merge with 3.9c