Merge changes from topic "intel-plat-refactor" into integration