issue #21836: More support for activities