Merge pull request #1685 from wpaulino/anchors-prep