Archive of ARMSX2 branch 'refresh-experimental' @ 2b69aceb72062a8a4cbb48fa05a7572e4440e315 (consolidation)