merged clansphere patches, updated prod