Merging in relvant changes from no-evil