[us32935] squash rebase na us32280