Merge branch 'core' into arm/tegra