Merge commit '693928cf9f758da348ed7f11cf43442f1efcf435' into 1.8.12-temp