Merge "Refactor/enhance dispatch table init"