merge with 3.8.3a