Merge "Cache OverContext to prevent deadlock" into tm-dev