Merge remote-tracking branch 'origin/feature/7022_alg_dialogs'
Merge remote branch 'origin/bugfix/7024_minor_wiki_fix'
Refs #7030. Fixing reported crash.
Merge branch 'bugfix/7030_vsi_crash' into develop