Merge "Backport fixes and enable new Dagger Validations" into main