'Merge' plugin source code (except ecobee API module) from 'internal' branch