caf: update caf branches