Merge "Add multicast address cleanup for test failures" into main