Merge pull request #2367 from wpaulino/remove-anchors-flag