Forward feature from ISTANBUL ISSUE 542