Merge topic 'enum_set-enhancements'

77ab2446d4 enum_set enhancements, step 2

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !10272