Merge branch 'hotfix/2.2.9'
Bumped component.json version number
Fixed conflicts