Merge "binderStabilityIntegrationTest: product support" into main