Merge cide for the next release