Sync with Paradise Master

Sync with Paradise Master