Fix concat's in components directory
Merge pull request #5371 from wilsonge/concat

Fix concat's in components directory