mainline: 3.5-rc6
stable: 3.4.4