ref: refs/heads/daniel/clean_dual_setup
