This fixes #8320.  The checkbox is added.