Merge pull request #1906 from wpaulino/prevent-downgrade-from-anchors