Merge "Fix issue 2929440" into gingerbread