Merging updates of embxx.