Merge branch 'arch-configs'