Merge branch 'disintegrate-frv' into disintegrate-misc-arches