Back merge from Release 3.7