Revert topic 'dev/faster-evis'

It will be revised and restored again.
Merge topic 'dev/faster-evis' into next

4d02ac9a Revert topic 'dev/faster-evis'