cyclus/#779 companion