fuji: switch to CFX branches