Merge "Improving diags for containers disappearing while getting children" into sc-v2-dev