Merge remote-tracking branch 'origin/master'
Update libraries
Merge remote-tracking branch 'origin/upgrade_component'