Sync from old charm repo