QAART-137 initial commit