Silvermont support backport from trunk to 4.8