PLFM 1890: follow up tasks