Tweaked in response to some linter suggestions
Merge branch 'development' into solutions