ticket_22275 WIP