Merge branch 'vs/prompt-avoid-unset-variable' into maint