Merge "Inject getS2rS2dConfig through constructor." into main