Merge pull request #1210 from jim-krueger/1209-deprecate_@Context_@Suspended

Deprecate both @Context and @Suspended