Merge "Refactor/enhance dispatch table init"
am: 464c8cc19d

* commit '464c8cc19dacc544a16b2a0ffb104d4a4c25753b':
  Refactor/enhance dispatch table init