Add ServiceType to ActionContext
Merge branch 'v3-fixes' into v3