Follow-on to #480
Activity