Merge "Fix issue 3007862" into gingerbread