Merge "Revert "Adding multiple provider support in AbstractMasterSystem..."" into tm-dev