Shared base (25/26)

Shared base