Merge "Removing ununsed append logic in search" into tm-dev