Merge "Fix issue 3098850" into gingerbread