Forward feature from ISTANBUL ISSUE 229