merge with 3.9h