MSM-25 first commit for the refactoring of different sources management