Fixes #6020 Add support for editing comments