Merge "Fix issue 3479042."