Pull in edc/elm changes for text defines from upstream