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