Merge "Fix MSB config section"