merged to 3.4.5