US529 - started to refactor to add new fields
Merge branch 'development' into development-work
US529
US529