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