Add one large patch that addresses multiple upstream issues.

Signed-off-by: Krzysztof Wilczynski <krzysztof.wilczynski@linux.com>