Merge branch 'sam_cache_includes' into next
Merge branch 'next' into sam_3185