3.10.3+ upstream