merge with 3.8.4c