[BACKLOG-1619] -second