SOL002_11 and minor fixes

1 job for 2.8.1-dev in 0 seconds (queued for 11 seconds)