Merge from nicta