dont list the same resolver more than once
dont include nils in the resolver list either
use compact method to drop nils instead
Merge branch 'master' into development