issue #22067: move out commercial specs