US529 - remove streamlined screens and ensure tests work
Merge branch 'development' into development-work