merging in relevant changes from no-evil