Making the app work with a dojo build

fixes #29644
merge conflicts