Upstream commits 85a4d2d41dc6d1c0296326204a857a9fab864a31 and b1beab48f6148d50fee4a56d741cc3168fe1b995
Upstream commits 85a4d2d41dc6d1c 0296326204a857a 9fab864a31 and b1beab48f6148d5 0fee4a56d741cc3 168fe1b995