Merge "revert back csit-api for guilin and frankfurt branch"