merge with 3.4