merge in oc-dr1-release history after reset to master
tree: 5f71312d5cda51235e89c218f35e23214fb25226
  1. vrcore/