Merge "Refactor some codes for unbundle (4/N)"