backport: edits