Merge "Enhance / fix REST resource resolution"
tree: 713135ee5ceac6fcc473cd832798982aa891466f
  1. ms/