Pull in changes from elia fork