US536 - Translation updates
Merge branch 'development' into development-work
US536 - fix broken tests