(cherry picked from commit ea3ff797c87313e71f2ed2fd2b932a18a4b4400b)
Related to #695
This applies to both the root-level and the bar configs. Closes #1937.