(cherry picked from commit bc06f19efb9a13a2b3fafbdc2ce35427e64c9402) Signed-off-by: Domen Kožar <domen@dev.si>