merge with 3.9i