sync with azores-devel