Upstream sync

Upstream sync with Paradise.