Upgraded features extra module
Merge branch 'hotfix/release-3.1'