Fix Borland build error
Merge topic 'dev/faster-evis' into next

bce9b36f Fix Borland build error