BZ-0000: Merging TrackpointService improvements from PM feature branch so it can be included in next RC.