Forward feature from PRAGUE ISSUE 469