changelog: merge 18.05