merge tag from 3.6