Merge "Fix bug 2888333"