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