Merge "Do not cache the resource if the active sub info is null" into tm-dev