Better use of group type in interim announcement tools. Fixes #2989. - Legacy-Id: 17809 Note: SVN reference [17797] has been migrated to Git commit 9ba71bebac
9ba71bebac