Merge branch 'next/isa' into topic/misc