Merge pull request #3746 from amet/setDefaultSubServices