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