Merge "Fix bug 2771204"