Track the 4.0.8 md-addins branch