Add missing import of Parameters
Add missing socket import.
Merge branch 'master' into component/tinge