these changes are made on tafana but were never commited
resolved a merge conflict
fixed merge conflict