merging latest debug version with trunk