Merge [tag:remote-desktop] into [tag:terminal-services].