Merge pull request #2415 from wpaulino/update-fee-anchors