Will allow multiple internal sources again not only 1 external source of each type
Update ChangeLog
Merge to 4.0.4