Apply Upstream code (2021-03-15)