bringing in changes from upstream

Change list for v1.48