Merge branch 'arch-ia64' into no-rebases