Merge branch 'bug#238' into 'v2.7.1'

Getting SOL006 ready for 2.7.1 as part of bug#238

See merge request !45