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