Merge "Fix issue 2913071." into gingerbread