QAART-233 todo added