merge with 1.8.1a