Merge change 20640

* changes:
  build libRS