Merge topology enhancement on feature-twincpu back to master branch, as the third step of the progress to merge feature-twincpu back to master.