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