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