latest FCS merge, including updated cycles info