Change to import all extension behaviors
Merge branch 'hotfix/1.1.2'