Merge pull request #3090 from Nicofuma/ticket/13234

Ticket/13234