Per standup this morning, we'd like to get the develop branch back to a release-ready state by reverting #8454 about citation field improvements. Reverting should fix the following issue: - #8533