Merge branch 'sam_803' into next
Merge branch 'sam_803' into sam_803_dummy
Merge branch 'sam_803_dummy' into sam_803_detemplatize