Tested up to 3.8.1.
Merge branch 'hotfix' into dev