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