Merge pull request #9406 from MrPetovan/bug/9385-frio-edit-detach