issue #21836: First pass adding support for activities.