Fixes JS error preventing the v3 UI from loading.
Merge branch 'release/2.4'