Merge "set default supl config to MSB"