Merge "Support ContextWrapper by replacing instanceof checks with token checks" into tm-qpr-dev