Fix #6123 #6226: prompt files and import bug fix (#6236)

Fix #6123 #6226: prompt files and import bug fix (#6236) #2417