merged with 3.4.7