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