Merged fcold branch