Merge "Update pass-through opt-in EnabledSince to Baklava" into main