US804 - further development
Merge branch 'development' into development-work
US804 - Fix typos and broken tests
US594 - Fix text after user comments