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