Merge branch 'topic/isa' into topic/misc