Merge changes I0bd9becd,I1f2967dc into sc-dev

* changes:
  Add new component usage event (2/2)
  Add new component usage event (1/2)