Merge branch 'runtime-consolidation' from Extensions into 'primitives-total'