Merge changes from topic "health21"

* changes:
  Require health 2.1 on R devices
  health 2.1