Merge branch 'development' into release
Added update to remove old field table (ting_reference)
Merge branch 'release' into development