Merge branch 'temp-solutions' into solutions