Synced with latest intel
Brought to working condition