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