Sync latest changes from Love & War update