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