Fix Dissolution Chamber upgrades.
Closes #1690
Merge branch 'development' into 1.8