Merged change from Commit 3d7481ab7d993a7192578e731155806ed7c22895 by Youri.