Merge "Use local context instead of hidden dependencies on global variables."