snapshot
Merge remote-tracking branch 'personal/solutions' into solutions