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