Working version of #1079 in beta, to be merged with original addon when backwards compatibility has been developed.
Build ev