Merge "Refactor some codes for unbundle"