Merge "add hints to description of action=edit"