Merge "Fix issue 2988031." into gingerbread