add component context
Merge master into dev