Ticket #1860 - step1