Merge "Allow subclass to override getS2rS2dConfig." into main