Adjust weights
Merge branch 'release/1.1.1' into stable
Merge branch 'stable'