Fork from Mike's edav again to resolve conflicting commits