Merged default into stable
Merged bug25838 into stable