issue 21836: Orm support for activities.