PMO-2491: first steps