Merge dev into feat/canceled-prompts-in-history