Merge pull request #1783 from thloh85-intel/integration_v2