Make sure we do not have null context.
Remove Internal version text.
Import correct jar
Merge pull request #1794 from jburel/rebased/dev_4_4/annotation-well

Related nodes (rebased onto dev_4_4)