CONTRIB-4734 :: Improve processing of Activity completion

Signed-off-by: Joseph Rézeau <moodle@rezeau.org>