Merge "Separate workspace item finding logic" into tm-dev