CF-188: agenda/p/...