Merge "Introduce opt-out options to stable configuration" into main