Merge changes from topic "redo_ims_poll"

* changes:
  Remove "one shot" type of FeatureCallback
  Clean up IMS based interfaces to use a push model instead of poll