Merge "csit set up not up issue fix"