Merge commit 'f45076dd37a649c9bdf10aaf5bc42793c72b497d' * commit 'f45076dd37a649c9bdf10aaf5bc42793c72b497d': Fix bug 2129190