PMO-2580: todos added