Feature/cui 0.87