Hotfix/merge extension config