update solutions to reflect material changes
Merge branch 'master' into release