Forward feature from ISTANBUL ISSUE 254