Sync against azores-devel adjustments