Fix for modular-scale usage.
Merge branch 'hotfix/2.2.16'