fixed misc analyze warnings, and duplicate assignment of changedColumns
Merge branch 'develop' into feature/swift_integration