Merge "Skip tests that require platform fix before S" into main