Merge "Add hidden authenticationExtras field to Dataset class" into main