fixed a bug
Merge branch 'development' into dde_integration