Merge changes from evispa.