#10601 - redefine activity service as annotation