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