Final CI 2.0 after small bugs fixes