Fix undefined variable notice on reload
Merge branch 'release/2.11' into develop
Merge branch 'develop' into release/12.0