Merge "Fix issue 3142808." into gingerbread