Merge "Fix issue 3126094." into gingerbread