Comment module support and edit flow changes