Bug 995000 - Clarify solution description and remove double commas
Merge branch 'bug-995000' into development