Merge "Fixed the problem in which different containers could have different mac addre...