Merge pull request #8142 from FiloSottile/filippo/updates