US537 - continued dev
US529 - Improve tests/fix failing tests
Merge branch 'development' into development-work