Ticket/12917 asc

3.1 version of #2808