Merge "Use scope -only for genius csit"