Merge "update the arch diag for the F release"