Merging changes to embxx.