Merge issue 11662.