Merge changes I09e780af,I21367c66

* changes:
  Implement proper subtype advertising
  Implement proper discovery with subtypes