Merge changes Ie756b9aa,I38110f3a

* changes:
  [NS A19] Inline updateCapabilities in rematch.
  [NS A18] Reverse listens and request-availables