Forward feature from PRAGUE ISSUE 371