Merge "fix package list component"