Merging changes to "embxx".