This fixes #8372.  The add on package has been setup.