rewrite incall context to authorizing '+' character
Merge branch '4907_plus'