Sync Changes from Paradise Master

Sync changes