Merge "made SHAKE work again with particle decompostion" into release-4-6