Fixes reloader not working from the root path.
Merge branch 'release/2.1' into release/2.2
Merge branch 'release/2.2'