Merge pull request #7245 from Suyog241005/feat/debug-container-target-v2