Merge branch '2759_edit_gzipped'