Apply latest embedlite changes from 33 to 34