PMO-2689: first running version