Add extensions support.
11 steps.
Test cases update.
Return type for dbgbranch