issue #22155: Improvements on presentation and management of activities.