Anchors for options (re#9866)
Changes file for 9866