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