merge with 3.4.1