Ticket/10786

Rebased on develop + fixed commit message