Fix comment in resolver
Merge remote-tracking branch 'upstream/devel' into devel