Fix: 'resolve' method re-writing
MERGE: merging master version of the 'pre-tag-hook'