[TASK] Rebasing to use latest Flux changes