US632 - fix clearing down data issues
Merge branch 'development' into development-work