Commit 2.7.1 (to the correct branch)

Fix Export where fields would not load in certain cases